*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f726bc795ea7552fb1db759faa6cfe44d1b40724..39ba85a5ed68ddfa84b4ceb080c4cc6320302390 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -95,12 +95,7 @@
 
        * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring.
 
-<<<<<<< ChangeLog
->>>>>>> 1.10388
-2006-12-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-=======
 2006-12-01  Ben North  <ben@redfrontdoor.org>
->>>>>>> 1.10392
 
        * paren.el: Fix the highlight overlay extension when the user types a
        sequence of char very fast just before the open parenthesis.